From c9db22b27ef08101ab89b1e0c1ad38808aa9e30c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 29 Dec 2003 10:58:46 +0000 Subject: [PATCH] (reset-language-environment, set-language-environment): Don't invoke fontset-related functions if fontset-list is not fboundp. --- lisp/international/mule-cmds.el | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 18ddf566c7b..dca8b80744e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1693,7 +1693,10 @@ The default status is as follows: (setq nonascii-translation-table nil nonascii-insert-offset 0) - (set-overriding-fontspec-internal nil)) + ;; Don't invoke fontset-related functions if fontsets aren't + ;; supported in this build of Emacs. + (and (fboundp 'fontset-list) + (set-overriding-fontspec-internal nil))) (reset-language-environment) @@ -1800,10 +1803,13 @@ specifies the character set for the major languages of Western Europe." (require (car required-features)) (setq required-features (cdr required-features)))) - (let ((overriding-fontspec (get-language-info language-name - 'overriding-fontspec))) - (if overriding-fontspec - (set-overriding-fontspec-internal overriding-fontspec))) + ;; Don't invoke fontset-related functions if fontsets aren't + ;; supported in this build of Emacs. + (when (fboundp 'fontset-list) + (let ((overriding-fontspec (get-language-info language-name + 'overriding-fontspec))) + (if overriding-fontspec + (set-overriding-fontspec-internal overriding-fontspec)))) (let ((func (get-language-info language-name 'setup-function))) (if (functionp func) -- 2.30.2